merge master with branch