checkout and confirm with kerri
fixed merge conflicts