Merge conflict

Author: prathamesh-sonpatki

Gemfile.lock

@@ -255,12 +255,11 @@ GEM
       mini_portile2 (~> 2.1.0)
     parser (2.3.2.0)
       ast (~> 2.2)
+    path_expander (1.0.0)
     pg (0.19.0)
     pg (0.19.0-x64-mingw32)
     pg (0.19.0-x86-mingw32)
     powerpack (0.1.1)
-    path_expander (1.0.0)
-    pkg-config (1.1.7)
     psych (2.1.1)
     public_suffix (2.0.4)
     puma (3.6.0)