Make future merging easier