moved lines to avoid merge conflict