Fixed conflicts from the merging.