Fix conflict for overview