Trying to remove conflicts