breaking out a new function for resolving the fight
Adding a gitignore