weird merge pt. 2