bug fixed at master
confilct resolved