Make merge with Jonas compile