Merge errors fixed