Fixed conflict

I wasn't aware of a conflict... solved.