Fixed conflicts
Merge pull request #106 from findsorguk/fixConflicts

Fixed conflicts