create someclass
fix from first repo
fix conflict