fix error on transporter cheque
fix conflict
add view/action method to view and edit userProfile. this fixes dashboard errors
fix conflict