Show each conflict resolution option on their own line. Closes #23

Looks like the br-tags are there for a reason after all