removing the logo
mergin changes and resolving conflicts