fixed a merging conflict