removed .class from tracking
merged code