David Gartzke fixing merge