fix controller conflicts and remove unecessary merging files
Merge https://github.com/hackthisclimate/helios