editable description
fix merge errors