add gui figure
resolve conflict