Final commit before tag
Fixing merge conflicts