commit to pull
fix conflict
complete edit class info