commit a
resolve conflicts