changed color
fixed mergeconflicts