Merge with bgoli