Fixed the error encountered when pushing the icon changes into Git, by checking the cause of the error, as per checking, I and Nate have the same changes on the same blade on the same line of code, modified the blade remove my changes, and retain the changes of Nate, then executed adding, committing and pushing, this is successfully executed and the error encountered in merging has been solved.