fixed Galileo
Fixed Conflict