add local
resolve conflict