Removed unnecessary < in error message
Removed unnecessary whitespace
Merge pull request #52 from syphoxy/master

Resolved overwrite conflict errors not showing