removed some lines from merging files