fixed clear up
fixed package
fixed merge conflict