initial commit to merge works together