Merge -s ours branch 'master' into recover