ui redesign
resolving conflicts
fb log in