commiting to pull
commit to merge
updated cube test to fix a bug
added fix into the main project
commiting to pull. merge conflicts fixed