fix incorrect merge resolution from ab052d32c5 see: #5