Fixed conflict

I hope!