Improved merging but I still thinking it is not working properly.