Fix merge conflict in app/models/mentor