final changes
adding txt
fixing conflicts