commit changes, may need to be discarded
fixed merge conflicts
Merge branch 'dev' of https://github.com/nyus/FP into dev