Some updates
Fix up conflict