Added some changes to pull from remote
Fixed conflicts in map