fix merge conflict

diff --cc app.js
index bda679382400c0d60f4a1b1f0cd70a8f5ac849f3,cb332c384d760c4c6b0f54a073b27e27dbb4ccad..c94efaed7bd56c8ec0324494f44fec7f8b692282
--- 1/app.js
--- 2/app.js
+++ b/app.js
@@@ -1633,12 -1632,13 +1633,13 @@@ app.get( '/archive/course/:id', checkAj
  })
  
  app.get( '/archive/note/:id', checkAjax, loadUser, function( req, res ) {
+   console.log( "id="+req.params.id)
    ArchivedNote.findById(req.params.id, function(err, note) {
 -    if ( err ) {
 -      sendJson(res,  {status: 'error', message: 'This is not a valid id for a note', err:err } );
 +    if ( err || !note ) {
 +      sendJson(res,  {status: 'error', message: 'This is not a valid id for a note'} );
      } else {
        ArchivedCourse.findOne({id: note.course_id}, function(err, course) {
 -        if ( err ) {
 +        if ( err || !course ) {
            sendJson(res,  {status: 'error', message: 'There is no course for this note'} )
          } else {
            sendJson(res,  { 'layout' : 'notesLayout', 'note' : note, 'course': course, 'user': req.user.sanitized } );