Fix #820 conflicts