Added check for all caps.
Fixed merge conflict.