Conflict Phase 1

Signed-off-by: alex <ahernandezsis@unm.edu>