fixed staging bugs
still fixing merges and branches...