updates
resolve merge conflict with Markdown Preview
update packages