first commit
merge issues