merge a little bit