Removed a conflict line that had been commited