tried to remove conflicts