Merge Error sorted out