Fixing missed conflicts