I have a file generated by Studio named config.json. I am trying to perform a merge and the file is flagged as having a conflict, although it does not. The conflict window does not allow me to resolve the conflict, because the save button is disabled. So solving the other conflicts is cancelled and the merge fails. What do I need to do to resolve the problem?