google+ loader effect removed
merge conflict