Merge conflict actually fixed