basic markdown parsing
resolve merge conflict