tmp
conflict resolved
bug report done closed #13