Fixed leftover junk from merge inserted by git