Main merge