Fixed some conflicts, fixed other bugs