add .gitignore file
Remove conflicts
More conflicts removes..