Resolved merge conflicts for upstream merging