Fixed conflicts
Commiting this stash from the wrong branch