checkpoint before merging
checkpoint before merging2