changing same line as previous Adam commit
changing same line as previous Adam commit, resolving merge conflict