resolved the errors that came with the merging