update gitignore
resolve merge conflic