stud2 change A
stud2 resolve conflict