reset file to origin/master for cleaner merge