changes due to conflicts