Merge resume changes