Fix merge conflicts with issues.mkd