fixed index
removed empty class
finish merging