Adding elipses to description
Adding elipses and merging the conflict