resolved all merge conflicts. use this