with save button
resolved conflicts