Remove temporary 'locking' branch flag file, since we merged