Fixed conflicting changes