class finished
after merge