fixed merge foul