Serialization improvements
Added patch management functionality
Added merge conflict solving functionality
TODO: squash merge with 50e9ea480eed09e819d0dd1f2ce66e1d8e597a01
tmp