Conflicts

Fix conflict markers. I also sorted the lists.