Fixed my conflict stuff