Get rid of wierd bug
Merge remote-tracking branch 'origin/master'

Rid of conflict too