Commit after unpulled changes
Attempt to push not pulling before that
Merged master to friend
Pulled