Ship Odyssey: fix merge errors, remove build warnings in zoomInTimerFinish()