fixing the merging conflict