Fixed merging issues, changed the name of a parameter