commit before merging with core