Moving markdown comment to the right place, ooops
resolving conflicts