got rid of to motors
fixed merge conflict?