fix hasty merge