bashrc tweaks
guard p4 access
merge