add f1, f2 features
fix hello.py
solve merg conflict