I don't think this will cause problems? Not sure where the conflict is because I don't understand how to use git.