remove p4merge section