Removed conflict files and comments
Merge pull request #49 from SableRaf/develop

Removed conflict files and comments