had conflict strings file is bitching now