more black magic
resolved some conflicts