Fixed error messages
Fixed merge conflict.