Fixing merge conflict.