Fixed merging leftover issues