Remove merging leftover.
1 file changed