Car: check if traffic light is green
Car: Resolve merge conflict
Car: Resolve some stupid merge conflict. Git can be a huge pain in the ass at time...