fixing conflicts aka my life