Main merge errors fixed