The logo
a
Fixed merge issues