beginning example work with camila
fixing merge conflicts