started friendly forwarding
fixed merge conflicts