commit a1
resolve conflict in a