add setMarks feature and logout
resolve conflicts