bug/merge changes