Fixed merge confict ignore user dir .gitignore