Fixed Reinhard's conflicts