further fixing merge conflict.