committing master
Fixed merge issues