shift Calculator class created
pull conflict resolved