Odd merge fixed