bugfix: merging

Change-Id: I5cf179f92e068b925ef210ce69dbf7e3ecc3b677