Fix merge conflict and git ignore removed files specific to the ide that were not necessary to sync with git