remove conflict

I didn't notice and travis is slow today