Fixed some issues with conflicts.