fix merge derp

Signed-off-by: Jake Whatley <jacob.whatley91@gmail.com>

fix merge derp #2

Signed-off-by: Jake Whatley <jacob.whatley91@gmail.com>

fix merge derp #3

Signed-off-by: Jake Whatley <jacob.whatley91@gmail.com>

fix merge derp #4

Signed-off-by: Jake Whatley <jacob.whatley91@gmail.com>

fix merge derp #5

Signed-off-by: Jake Whatley <jacob.whatley91@gmail.com>