Ignoring tildes
conflicts
merging