git reset HEAD Viper.suo
Merge remote-tracking branch 'origin/master'

Conflicts:
	Viper.suo
Add Assign Block.