clean up shit on merge