added label color
fixed conflict save filenaming