conflict resolved
Merge branch 'master' of https://github.com/technomicssolutions/resource_wagon