Trying to solve conflict