Merging is hard

Signed-off-by: Tyler O'Meara <Tyler@TylerOMeara.com>