Only indent if environment return true
Manual merge from remote