fixed lingering conflict issue, sorry
Fixed lingering conflict issue