fixed merge conflicts
Merge pull request #16 from kexline4710/coordinator_view

fixed merge conflicts