merged conflicts in readme