solve scaling problem
solve conflict