Fix merge conflict on ScriptRepositoryView.ui

re #7031