Add lock ability to conflicts