This should be done at the end to avoid conflicts arising in the git
This should be done at the end to avoid conflicts arising in the git