Add tshirt-size
fix merge conflict