Fixed mistake commit

took out conflict text