Updated ST2 packages
fixed merge conflict