Removed Motorcycle2 and fixed merge error I introduced.