fixed a couple of bugs in assign and declare

Signed-off-by: Jason Kuster <unexpectedapocalypse@gmail.com>
fixed merge conflicts

Signed-off-by: Jason Kuster <unexpectedapocalypse@gmail.com>