Merge "Finalize .conf file"