[#54905490] Cleaned up a missed git conflict