ReBugFix: merge failure