Car collision prevention on returning cars. Fixed error with first placed charging station
fixed merge conflict