reset to not merge foursquare
fix conflicts