fixed the capititalization
fixed the merge conflict.