commented out merge_commits