fix horrible merge failure