Resolve remaining merge conflicts