delete unnecessary div
fixed merge conflict
centered our profile photos