still resolving conflicts