Retrying "merge" between 9bd9320 and 053066

basically just did it manually