fixed pd
fixed merge