resolved conflicts
Merge branch 'refactored' of https://github.com/workprotocol/frontend into refactored