FB login working
merge done