GUI update
Mergeconflict solved