moved logo back to the left
resolving conflicts