Update merge field to avoid conflicts