Conflicts: MarkdownLive.xcodeproj/project.pbxproj MyDocument.m discount/VERSION discount/configure.inc discount/main.c