modify file 3 on local
resolve conflict with remote