Messed up and used == instead of !=
Merge remote-tracking branch 'origin/master'