initial commit
second commit
fixed merge issues