map bug fixed
conflict