'merge conflict' bug fix
more fixes for merge bug
updated archive