Conflict files

Please resolve them and commit per command (This file will be deleted before the commit).

• Not a file: .vault-stats