Something got lost in a conflict resolution. Fixed