made some changes of some sort
fixed merge conflicts.