fix merge + added some protocolmanager code

- removed DS store files
- fix merge
- added some protocolmanager code