kristen commit 10:31pm
fixed merge conflicts