install changes
 install changes conflict resolved