add perfdb alias
resolve conflicts