still working on merge from branch
branch to master code done I think