fixed more merge errors