FIXED MORE OF DEM MERGE CONFLECTS