Merge failure fix