cleaned a conflict line