done the fb login problem and the title
resolve conflict