Fixed merge conflict.