Removed a conflict line