updated merge conflicts