prepping for pull
fixed merge
added new lockin files