LPS-36192 Modified Site pages should not block Site Template merge
LPS-36192 Simplify the logic