github shows conflicts, however git recognizes them as file moves so there isn’t actually anything to do locally other than merge the changes in