issue fixed #3
merge conflix fix