changes to conflicts so that the layout is correct