Fix merge failure