Pull for update
Fix Merge