fix meging conflicts