Updated readme to explain the conflict.log file a bit