resolving conflicts again