fix detecting image by mime
fix sync after resolving conflict
make conflict label dinamicly