applicationConflict Resolved