cleared merge conflict, added a let