Fixed local merge issue