Changed motor ports to correct values.
Fixed merge conflicts.