Add clash constraints when merging