Some merge conflict fixes on receipt