Add deprecation I accidentally missed
Fix mergefail in changelog

The line was duplicated