merge conflict fixed
keeping secrets