Fixed Merge conflict.