Add resolver of the BSQ!
Commit before merge
Merge conflict