Deleting merge zombie.
1 file changed