Fixed merge conflict in GUI