remove junk file was created by conflcik mergeing