Partial sover
merging changes