Fixed a merging conflict