fix user test and conflicts