Resolve merge conflicts; Add user info to profile tab