commiting again after resolving conflicts