Desktop Commit

For testing of conflicts.