Removed the conflicting merge options.

No need to set them anyway.