fixed will's merge