changed app with google
changed index with new app
Fixed COnflicts