fixed issue with merge conflict, but inputs arent working now...