match version control conflict markers