Finish All Statistics
commit Makefile
commit merge after conflict check