Finished merging stuff