fixed bug
merged bug fix
conflict fixed