Testing merging conflicts