Conflicts part added, but not sure if it's right