unzip file
resolve conflict