.gitignore
colorful message
fix conflicts