merge: fix bug