Removed merge duplicating joyride code
Fix action permissions