possible bad if statement
Merge remote branch 'upstream/dev' into dev