merge my commit