Conflict files from eclips

Conflict files from eclips