Some updates.
Updated some stuff and also fixed conflict.