Updated sources (fixed some conflicts)