first commit with info
merge with local