resolving confilicts

resolving confilicts