Added ConflictRequest and worked on general conflict handelling