cleanup and fix merge problems