create a conflict via sourcetree
Second SourceTree commit