Removed a forgotten ===== from a merge conflict