Tips_and_Hacks/Merge Conflicts.docx