remove files which cause merging conflict