2nd line by GUI
resolve merge by GUI