fix merge conflicts with clicktype