All fixed, merging