rmved files
bug fixed v1.1
resolved merge conflict