fixed merge conflicts with edit.blade.php for mentor and mentee