bug fix release 1
conflict solved