This indicates a merge conflict and should be resolved before moving forward.  I recommend that you sit with someone to review the process you are using here for tips and best practices.