Cleaned up commit code
Cleaned up merge conflict
Merge branch 'v2'