fixed conflict breaking ramble controller
Merge pull request #106 from Noahhh/master

fixed conflict breaking ramble controller