[Merge conflict fixed]