file after merge
branch file after merge
gitignore modified