Added cue ball placing after scratching
Fixed merge issues