error: Your local changes to the following files would be overwritten by merge: app/calls/resources/classes/follow_me.php Please commit your changes or stash them before you merge. Aborting