fixed bug due to simultaneous merge w green