Manual merge to resolve conflicts