solve conflict

kept inputEnabled