add fab clean function
fix merge conflict