changed colors and add conflict detection