finalized markdown and merge