doing arbitrary commit after pull to avoid fast-forward issues