resolved conflicts with origin