Fixed some conflicts due to the merge