Commiting so I can pull
Fixed merge conflicts