merging conflict fixed