resolved conflicts
unmerged files
preferences