Fix Merge Conflict.