Small merging conflicts