Merge my version