.gitingore changes to ignore class conflicts