cleanup after merging fork