git master branch is clean, but when I try to switch, git says there is a conflict <img width="615" alt="Screen Shot 2022-01-22 at 10 46 57 PM" src="https://user-images.githubusercontent.com/29007161/150667852-59fd4492-d7dc-4377-8815-3cbf83312286.png">