Just remove a line here.
The merge process seems to be adding a blank line, resulting in 3