pics_reduced
pull
unresolved confiicts