trying to remove conflicts