stuff
manual merging