Merging some stuff