Test for merging changes