Removed leftover line from merge