again fixing merging stuff