Fixed a lot of issues caused by conflict