merge, again