Hard override on changes from master repo