merge and conflict stuff