Fix: Should support updates for merging