Added test file for merges