stashing changes josh noted
fixed merge conflicts