fixed condition
auto-merge staging into master