fixed problems caused by merge