merging implemented

Signed-off-by: cderamond <cderamond@gmail.com>