git conflicts resolved manually
conflict issues resolved