loredana branch: test merge conflict