add copy edits to application docs
Fix merge conflict in application.html