Started tracking configuration files on vm-tepid
Merge conflicts