last commit was with bug
clean code
merging