Partial commit for merging