up to date deletions
full creation of markers except category
Fix merge conflicts