fix repo conflict