updated for no conflict
lint and release