file added to test merging