Update before merging