resolve merge conflicts
resolve merge conflicts

Vanhecke/gophish,rfdevere/gophish,alenbhclynpblc/gophish,svigne1/gophish,Vanhecke/gophish,alenbhclynpblc/gophish,svigne1/gophish,alenbhclynpblc/gophish,rfdevere/gophish,jordan-wright/gophish,Vanhecke/gophish,rfdevere/gophish,jordan-wright/gophish,rfdevere/gophish,jordan-wright/gophish,svigne1/gophish