rm *.*~ files
resolved conflicts from merge