resolved conflicts with commits