When working with git flow, the localizable.strings file is always marked conflict if it has any change. But in fact there is no conflict. Doese anyone have any solution?