Fix whitespace in conflict message.
Merge pull request #123 from bpindelski/whitespace

Fix whitespace in conflict message.