modify dev branch by alex
fix conflicts in dev branch