trip showing member and expense
fixed merge conflicts