update git ignore
updates for Talli
resolve merge conflict