before everything is set, please just forget about these trivial things; they add noise to the diff and can easily create conflicts