first commit
merge fixed