Bad message: Dunna what changed, just want the latest :)
Fixed merge conflicts, nothing major, mostly duplicated code