resolving conflicts from test and production