small repo for testing simple merges