fixed merge errors and test build