commit changes
merge files
resolve conflict