debug after resolving conflicts