another commit after john pull request at the same line