Remove Markdown resume from top-level directory
Fix merge conflict