Final fix after the conflict