bugfix: auto merge bug