preparing for a pull down
fixed merge conflict
spacing for specials