Merge "Set getEditConflictMainTextBox parameter type to array"