pls bio activity back-end dev
resolved merge conflicts