Accidentally left a line in from resolving conflicts