Fix merge conflicts, origin of upstream/jacob