Revert "conflict?"

This reverts commit 2e7660ae1bdb554e0cb192b2aee3037fcdbd089e.
Revert "avoid conflict"

This reverts commit df17c0b59320e98a32a2c58cafe3d56f2fb4ccea.
12:49 mobilesc logo, circle, png thing