merge my code