Removed conflicts and unnecessary optional
Merge pull request #1 from fjbelchi/Conflicts

Removed conflicts and unnecessary optional