merge actually fixed