still bug with merge

conflicts with merge due to
those 2 files :
- ardublock properties
- mapping ardublock