added test file for merging