Updated conflicts pt 2