First File Master Second Commit Tested Conflicts
First File Master Second Commit Resolved Conflicts second time