fixing merging mishap