trivial merge