move deletion of merge configuration to branch.c