<<<<<<< HEAD ./uploads/* ======= uploads/ >>>>>>> refs/remotes/origin/master