Conflict: File modified in both source and destination
To be able to merge you will need to resolve the conflicts manually
and i donwt know how to do it/
It looks like you're new here. Sign in or register to get started.
