Merge failure on my part