.gitignore at home
conflic fixed