Merging code updates