finished fixing conflicts