merged safety into master