merge Max with Master