merging files
merge conflict
fixed dependencies