the guard check after merge is finished now