resolve merge conflicts in gui.js