These changes will presumably go away, but in any case git has marked them as being in conflict, so you'd need to pull the latest version of the files and resolve the conflict before it could go further.