test file for merging conflicts