fix conflicts before merge