Attempting conflict file
staged two files including repair