rename MainActivity
left face activity animation
merge
conflict