bug fix: fix merge