Fixing merge conflicts. Updating copyright year.