restrain phantom with tilde in pkg.json
resolve merge conflict