merge last code