Some conflicting changes from command line.