merge conflict in interface_design.tex fixed