gitignore
merge failed branch