solve conflict in a better way