Just merge