merging changes from master
protect git changes from local dev