Fixed: merge conflict