Fixed dodgy GDA merges.