Changed Unity settings to support version controlling
gitignore conflict solved