Fixed my last commit
Fixed merge