Fix conflict for Endeavoru build