re-solved conflict