merge confilcts resolved
gitignore