Tooltips fixed for the blocks
Conflicts fixed