Add some logo and resolve merge conflicts