merge conflict: with the new folder structure this entry needed to be deleted