updated app title :D
Remove junk from conflict