finishing resolving conflicts