Massive merge with master