Resolving a few missed conflicts