Detect syntax change
Noconflict db port name
Merge remote-tracking branch 'RapGenius/master'