resolved some silly conflicts
that was some mergin
resolved campaign screen issue
some form awesomeness