fix bug 1
merged bug fixed 1
dev
deal confict