Actually fixing merge