corrected upstream conflicts