add guard
more commit
finish merge