Fixed bad conflict resolution when I merged feature-newice with feature-ice
resolved conflict that was none