merge errors resolved