additional merge conflict cleanup