Remove duplicate lines created by resolving git conflicts...