fixing the merge by removing extra stuff
adding photo particles