fixes addressing kate's comments

-Disabled editable/selectable feature in the credits menu
-deleted file from merge conflict