first major merge