the last modifications of code before ICSE submission
fix the conflicts