resolving conflicts dashboard add database conn