Fix conflict code