fixed merge conflict of commented out lines in 7 & 8
changed the method back to emission in the receipt model