Fixed conflicts with the merge