Fix merge compilation