fixed the weird merge