merged lucy's files