Finalized convolution kernel method
Fixed conflicts