resolved conflicts with upstream