fixed some missed conflicts