Merge conflict fixed