Merge MASTER GUI