add from pc
resolve conflict