commit after merging