Conflict with variable syntax
Merge branch 'feature/ternary'