add more variables
resolve conflict