[new] unique styling for conflicted dates
[fix] merge conflict, [new] save button