removes secret ignore from gitignore
resolve merge conflict