Removes the conflict markers and fixes conflicts