Commiting so I can pull
Fixed conflicts