Merge "Conflicting Error code"