jacks first commit
merge resolve