Remove double comment from merge
Bump DB Schema to version 21 to force db upgrade