please pull the code from upstream again and reset your local copy, your changes are conflicting now