correcting merge errors ????