fixed problems in merge