updating Express dependancy
merged conflicts