Update post-merge