Fixed conflict, edited syntax msg
Merge remote-tracking branch 'origin/master'