Fixing merging conflict