fix some missed conflicts