fixing more git diff artifacts