added feature 1
made hotfix
finished feature 1
trying to fix confilcts