Fixed merging conflict issue