Fix conflict.
Merge branch 'master' of github.com:origia/conductor-frontend