LIB001-441: Tidying up conflict mess