Resolving conlicts 2.