capitalize blah
fixed merge conflict in blah