fix conflicts and organize list preference to my liking