HELP! Problems with Merge Replication

Hi,
I have created a publication on SQL Server 2005 and am using SQL CE RC1 to synchronize with the DB from the client. We did not have any problems until we implemented microsoft recommendations in the Mergereplication script. We changed the following
1.Changed column_tracking to true from false.
2. use_partition_groups = true from null
3. partition_options = 2 from 1
4. automatic_reinitialization_policy = 1 from 0
and 5. join_unique_key = 1 from 0( this change was made depending on the relationships within the tables)

I have a couple of questions before tho
1. Does replication take care of transactional integrity of the both the databases( i.e if the synchronization fails in between for any reason, does it rollback the server DB and maintain the transactional integrity. Is there a place where we need to enable this?
2. What happens when you change row level to column level tracking. I am seeing in the "view conflicts" section of the replication object that there are conflicts. Does SQL Server take care of resolving these issues. If yes, how do we provide the criteria where the subscriber wins or the publisher wins and why do I see conflicts in the "view conflicts" section .
Please do help. We are in time crunch situation and need to deliver this app into prod this friday.

Below are a couple of errors that we received during merge replication.

Error 1:
Error messages:
The row operation cannot be reapplied due to an integrity violation. Check the Publication filter. [,,,Table,Operation,RowGuid] (Source: MSSQLServer, Error number: 28549)
Get help: http://help/28549

Error 2:

Error messages:

· The merge process failed because it detected a mismatch between the replication metadata of the two replicas, such that some changes could be lost leading to non-convergence. This could be due to the subscriber not having synchronized within the retention period, or because of one of the replicas being restored to a backup older than retention period, or because of the publisher performing more aggressive cleanup on articles of type download-only and articles with partition_options = 3. (Source: MSSQL_REPL, Error number: MSSQL_REPL-2147199363)
Get help: http://help/MSSQL_REPL-2147199363

The common generation watermark is invalid at this replica since it does not exist or metadata for changes not yet propagated may have been cleaned up. (Source: MSSQLServer, Error number: 21800)
Get help: http://help/21800

Thanks a lot in advance,
Kals.

Having the same 2 errors - did you identify the cause?sql