merge updated code