fix repo resource conflicts