a--b--c--M--d--f--E--g--h--i <<< master
\
\
x--M'--y--z <<< you
does your situation looks somewhat like above (where M and M' are the commits moving and E is the commit that edits the textures)? you try to merge z/i and git is not really happy.
you might try to merge M with M' on a temporary branch
a--b--c---M--d--f--E--g--h--i <<< master
\ \
\ X <<< helper
\ /
x--M'--y--z <<< you
and then merge helper ("X") with you ("z") and master ("i").
a--b--c---M--d--f--E--g--h--i <<< master
\ \ \
\ X-----XX---------XXX <<< helper
\ / /
x--M'--y--z <<< you
that way conflicts are resolved directly after they are created and not carried along. often this is easier because conflicts tend to grow over time.