Fix: avoid extra pull when merging from remote branch