github commit
basic mechanics
merge