Merge Error fixed