fixed merging stuff
helllooo