resolving conflict
removing old deprecated syntax