added conflict support, mendix version support, logging

we are getting there :)