merge up/down error master