Fixing possible merge conflict, let me know if this breaks anything on your end