fixed attack merge