fixed some error messages
resolved conflicts