Add working configs.
Fixed .gitignore merge conflict.