added api keys to git-ignored file
fixed merge conflict