@sophia generally on anything where i'm scared of merge conflicts i do a rebase to avoid them so i think it should work for a twine file too