password from file
solved conflict
added passwd from file