bug fixed
bug fixed
merge CONFLICT