get rid of the unwanted file
modified file
merge