How to solve mutation conflict