logo merge resolved