You can just remove this line. This may actually be the source of the merge conflict.