merge from simple green