Changed to 3 not 2
Merge branch 'feature/46'