After merge errors fixed