fix remaining conflicts