fixing more merge problems