Removed conflicted binary files