removed leftover line from merge conflict