Cleanup for pulll/merge