Fix don't propagate add, remove and merge options