Fixed merge exception
Removed no needed code
Implementing receipt Step2