modify by girl A
merge&fix conflic for two girls