Fixed missed conflicts