Mmm corrected merge