Merge updated code