fixed more merge problems