Merge with skyfire