fix: merging error