stability
All the conflicts have been resolved but the merge is not complete