favorites merge conflict solved