killed a darling
merge fix