fix merge and conflicts