Manually merge branch dev, consider the case when two blocks on the same page