Fixed merge conflicts
Trying to merge