Add alters + format + organize import
fix merge conflit