fixes display error in default merge flow