Merge conflicted files, these files were missed with previous commit for the merge