Fix merge errors, use version 1.X of packages
1.1.4