Merge with the main repository again.