fixed the merge errors that happen on last commit