.class removed from tracking
merged code