use exact version for npm modules
resolve conflicts

Change-Id: I5994b455c98d9ac4865f24f0ad064f50e55bbf08