fix: fix bad conflict merge