Fixed the merge conflicts that I fairly to fix