changes made by your branch
unexpected merge step
unknowingly created conflicts