save
completed someclass
rename someclass
fix merge conflict