Finish Static Pages After Clearing Merge Conflicts