merging some stuff