Add locks; Add exclusion and inclusion regexes
merge