conflicts in photonBucket hopefully resolved