remove unnecessary files
fix factory
fix merge conflict