Trying to write conflicts to repo for user resolution