pre pull commit
fixed merge errors